From 972177650314c31d5f49f29576a20fd6cebbf92b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 19 Jan 2009 12:07:32 +0000 Subject: [PATCH] (ftfont_lookup_cache): Check the return value of FcFontList. (ftfont_list): Likewise. --- src/ftfont.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ftfont.c b/src/ftfont.c index eb8893965be..b28c4c3ea21 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -310,9 +310,10 @@ ftfont_lookup_cache (key, for_face) FC_INDEX, FcTypeInteger, index, NULL); objset = FcObjectSetBuild (FC_CHARSET, NULL); fontset = FcFontList (NULL, pat, objset); - xassert (fontset && fontset->nfont > 0); - if (FcPatternGetCharSet (fontset->fonts[0], FC_CHARSET, 0, &charset) - == FcResultMatch) + if (fontset && fontset->nfont > 0 + && (FcPatternGetCharSet (fontset->fonts[0], FC_CHARSET, 0, + &charset) + == FcResultMatch)) cache_data->fc_charset = FcCharSetCopy (charset); else cache_data->fc_charset = FcCharSetCreate (); @@ -835,7 +836,7 @@ ftfont_list (frame, spec) FcPatternAddString (pattern, FC_FAMILY, fam); FcFontSetDestroy (fontset); fontset = FcFontList (NULL, pattern, objset); - if (fontset->nfont > 0) + if (fontset && fontset->nfont > 0) break; } } -- 2.30.2